Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 14 Jun 2010 22:48:13 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 14 Jun 2010 22:48:13 +0000 (22:48 +0000)

Trivial merge